Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix localization in Brave web-ui pages and Brave strings in general #829

Merged
merged 1 commit into from
Nov 8, 2018

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Nov 7, 2018

Before this PR localization would not show up for our own custom strings.
I tried making our own version of brave_repack_locales to avoid the patch but it gave some errors about things like "fr.pak" already exists. It seemed not easy to resolve so went with this since it was working and pretty lite on patching.

Fix brave/brave-browser#2035

After this lands I think I'll need a bit more to get it to work on Android, I'll do a PR for Android separate.

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@SergeyZhukovsky
Copy link
Member

++. Yep, I'm not sure will it work like that on Android or not.

Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@@ -6,6 +6,62 @@
<emit emit_type='prepend'></emit>
</output>
<output filename="brave_generated_resources.pak" type="data_package" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we generate brave_generated_resources.pak?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it's needed for the includes, otherwise, the includes for google tag manager polyfill and google services fails to load.

@simonhong
Copy link
Member

simonhong commented Nov 8, 2018

Hmm, I also tried to make brave_repack_locales template.
However, I was not able to avoid another upstream file modification (repack.gni)
As you written, I also think just modifying chrome_repack_locales.gni is the simplest way.(also simple patching)

@bbondy bbondy merged commit b8ecf37 into master Nov 8, 2018
bbondy added a commit that referenced this pull request Nov 8, 2018
Fix localization in Brave web-ui pages and Brave strings in general
bbondy added a commit that referenced this pull request Nov 8, 2018
Fix localization in Brave web-ui pages and Brave strings in general
@bbondy
Copy link
Member Author

bbondy commented Nov 8, 2018

master: b8ecf37
0.58.x: ac61ac2
0.57.x: 26e2b1a

@NejcZdovc NejcZdovc deleted the web-ui-l10n branch November 8, 2018 16:04
@bbondy bbondy added this to the 0.57.x - Release milestone Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants